Remove timout in async_test for websockets tests Remove all the timeout in async_test for websockets tests. Affected tests: 21 Before: Pass: 6, Failed: 15 After: Pass: 6, Failed: 15 Related: #11120
diff --git a/websockets/binary/002.html b/websockets/binary/002.html index f2fa16a..2e47a88 100644 --- a/websockets/binary/002.html +++ b/websockets/binary/002.html
@@ -23,5 +23,5 @@ t.done(); }); -}, null, {timeout:20000}); +}, null); </script> diff --git a/websockets/binary/004.html b/websockets/binary/004.html index 59b06d7..ec78742 100644 --- a/websockets/binary/004.html +++ b/websockets/binary/004.html
@@ -22,5 +22,5 @@ t.done(); }) -}, null, {timeout:20000}); +}, null); </script> diff --git a/websockets/constructor/013.html b/websockets/constructor/013.html index fe777af..ea732a7 100644 --- a/websockets/constructor/013.html +++ b/websockets/constructor/013.html
@@ -36,6 +36,6 @@ }, ws[i]); ws[i].onerror = t.step_func(function() {assert_unreached()}); } -}, null, {timeout:25000}); +}, null); </script> diff --git a/websockets/cookies/003.html b/websockets/cookies/003.html index 62c9a27..2525911 100644 --- a/websockets/cookies/003.html +++ b/websockets/cookies/003.html
@@ -29,5 +29,5 @@ ws.onerror = ws.onclose = t.step_func(function(e) {assert_unreached(e.type)}); }); document.body.appendChild(iframe); -}, null, {timeout:9900}); +}, null); </script> diff --git a/websockets/cookies/004.html b/websockets/cookies/004.html index 558d56c..6d4c49a 100644 --- a/websockets/cookies/004.html +++ b/websockets/cookies/004.html
@@ -27,5 +27,5 @@ }); ws.onerror = ws.onclose = t.step_func(function(e) {assert_unreached(e.type)}); document.body.appendChild(iframe); -}, null, {timeout:9900}) +}, null) </script> diff --git a/websockets/cookies/007.html b/websockets/cookies/007.html index dd47ffc..0431b65 100644 --- a/websockets/cookies/007.html +++ b/websockets/cookies/007.html
@@ -31,5 +31,5 @@ if (new RegExp('ws_test_'+cookie_id+'=test').test(document.cookie)) { assert_unreached('cookie was set during script execution'); } -}, null, {timeout:12000}); +}, null); </script> diff --git a/websockets/extended-payload-length.html b/websockets/extended-payload-length.html index 9e586a9..a5ea78f 100644 --- a/websockets/extended-payload-length.html +++ b/websockets/extended-payload-length.html
@@ -20,7 +20,7 @@ assert_equals(e.data, data); t.done(); }); -}, "Application data is 125 byte which means any 'Extended payload length' field isn't used at all.", {timeout:20000}); +}, "Application data is 125 byte which means any 'Extended payload length' field isn't used at all."); async_test(function(t){ var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); @@ -34,7 +34,7 @@ assert_equals(e.data, data); t.done(); }); -}, "Application data is 126 byte which starts to use the 16 bit 'Extended payload length' field.", {timeout:20000}); +}, "Application data is 126 byte which starts to use the 16 bit 'Extended payload length' field."); async_test(function(t){ var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); @@ -48,7 +48,7 @@ assert_equals(e.data, data); t.done(); }); -}, "Application data is 0xFFFF byte which means the upper bound of the 16 bit 'Extended payload length' field.", {timeout:20000}); +}, "Application data is 0xFFFF byte which means the upper bound of the 16 bit 'Extended payload length' field."); async_test(function(t){ var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); @@ -62,6 +62,6 @@ assert_equals(e.data, data); t.done(); }); -}, "Application data is (0xFFFF + 1) byte which starts to use the 64 bit 'Extended payload length' field", {timeout:20000}); +}, "Application data is (0xFFFF + 1) byte which starts to use the 64 bit 'Extended payload length' field"); </script> diff --git a/websockets/interfaces/CloseEvent/clean-close.html b/websockets/interfaces/CloseEvent/clean-close.html index acc7185..4e8f5b8 100644 --- a/websockets/interfaces/CloseEvent/clean-close.html +++ b/websockets/interfaces/CloseEvent/clean-close.html
@@ -19,5 +19,5 @@ assert_equals(e.wasClean,true); t.done(); }); -}, null, {timeout:2000}); +}, null); </script> diff --git a/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html b/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html index 6774237..6828c2b 100644 --- a/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html +++ b/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html
@@ -23,5 +23,5 @@ assert_equals(e.data, data); t.done(); }) -}, null, {timeout:20000}); +}, null); </script> diff --git a/websockets/interfaces/WebSocket/close/close-basic.html b/websockets/interfaces/WebSocket/close/close-basic.html index ab6c93b..08e496d 100644 --- a/websockets/interfaces/WebSocket/close/close-basic.html +++ b/websockets/interfaces/WebSocket/close/close-basic.html
@@ -22,5 +22,5 @@ }); ws.close(); assert_equals(ws.readyState, ws.CLOSING); -}, undefined, {timeout:9900}); +}, undefined); </script> diff --git a/websockets/interfaces/WebSocket/close/close-connecting.html b/websockets/interfaces/WebSocket/close/close-connecting.html index 009d6b0..be858fc 100644 --- a/websockets/interfaces/WebSocket/close/close-connecting.html +++ b/websockets/interfaces/WebSocket/close/close-connecting.html
@@ -21,5 +21,5 @@ }); }, 1000); ws.onopen = ws.onclose = t.unreached_func(); -}, undefined, {timeout:12000}); +}, undefined); </script> diff --git a/websockets/interfaces/WebSocket/close/close-nested.html b/websockets/interfaces/WebSocket/close/close-nested.html index fa30c83..be993db 100644 --- a/websockets/interfaces/WebSocket/close/close-nested.html +++ b/websockets/interfaces/WebSocket/close/close-nested.html
@@ -24,5 +24,5 @@ }); ws.close(); assert_equals(ws.readyState, ws.CLOSING); -}, undefined, {timeout:9900}); +}, undefined); </script> diff --git a/websockets/interfaces/WebSocket/events/003.html b/websockets/interfaces/WebSocket/events/003.html index a9b76d8..6c348bf 100644 --- a/websockets/interfaces/WebSocket/events/003.html +++ b/websockets/interfaces/WebSocket/events/003.html
@@ -17,5 +17,5 @@ var ev = document.createEvent('UIEvents'); ev.initUIEvent('open', false, false, window, 5); ws.dispatchEvent(ev); -}, null, {timeout:2000}); +}, null); </script> diff --git a/websockets/interfaces/WebSocket/events/007.html b/websockets/interfaces/WebSocket/events/007.html index 4305097..67c1ebd 100644 --- a/websockets/interfaces/WebSocket/events/007.html +++ b/websockets/interfaces/WebSocket/events/007.html
@@ -17,5 +17,5 @@ var ev = document.createEvent('UIEvents'); ev.initUIEvent('message', false, false, window, 5); ws.dispatchEvent(ev); -}, null, {timeout:2000}); +}, null); </script> diff --git a/websockets/interfaces/WebSocket/events/009.html b/websockets/interfaces/WebSocket/events/009.html index dc25884..38f1f57 100644 --- a/websockets/interfaces/WebSocket/events/009.html +++ b/websockets/interfaces/WebSocket/events/009.html
@@ -17,5 +17,5 @@ var ev = document.createEvent('UIEvents'); ev.initUIEvent('close', false, false, window, 5); ws.dispatchEvent(ev); -}, null, {timeout:2000}); +}, null); </script> diff --git a/websockets/keeping-connection-open/001.html b/websockets/keeping-connection-open/001.html index 2e5423c..4c5e717 100644 --- a/websockets/keeping-connection-open/001.html +++ b/websockets/keeping-connection-open/001.html
@@ -24,5 +24,5 @@ }); }, 20000); }) -}, null, {timeout:30000}); +}, null); </script> diff --git a/websockets/opening-handshake/001.html b/websockets/opening-handshake/001.html index 7274150..61cef5c 100644 --- a/websockets/opening-handshake/001.html +++ b/websockets/opening-handshake/001.html
@@ -15,5 +15,5 @@ t.step_timeout(() => t.done(), 50); }); ws.onmessage = ws.onopen = t.unreached_func(); -}, null, {timeout:9900}); +}, null); </script> diff --git a/websockets/opening-handshake/002.html b/websockets/opening-handshake/002.html index 052e644..9ada29d 100644 --- a/websockets/opening-handshake/002.html +++ b/websockets/opening-handshake/002.html
@@ -19,5 +19,5 @@ ws.close(); }); ws.onerror = ws.onmessage = ws.onclose = t.unreached_func(); -}, null, {timeout:9900}); +}, null); </script> diff --git a/websockets/unload-a-document/002.html b/websockets/unload-a-document/002.html index 03764c3..e847dc5 100644 --- a/websockets/unload-a-document/002.html +++ b/websockets/unload-a-document/002.html
@@ -10,7 +10,7 @@ <p>Test requires popup blocker disabled</p> <div id=log></div> <script> -var t = async_test(null, {timeout:15000}); +var t = async_test(null); var w; var uuid; t.step(function() { diff --git a/websockets/unload-a-document/004.html b/websockets/unload-a-document/004.html index 0ef4fbc..79f5ca8 100644 --- a/websockets/unload-a-document/004.html +++ b/websockets/unload-a-document/004.html
@@ -7,7 +7,7 @@ <div id=log></div> <script> var uuid; -var t = async_test(null, {timeout:15000}) +var t = async_test(null) t.step(function() {uuid = token()}); var navigate = t.step_func(function() { document.getElementsByTagName("iframe")[0].src = 'data:text/html,<body onload="history.back()">'; diff --git a/websockets/unload-a-document/005.html b/websockets/unload-a-document/005.html index 4bafe8b..ad64f27 100644 --- a/websockets/unload-a-document/005.html +++ b/websockets/unload-a-document/005.html
@@ -10,7 +10,7 @@ <p>Test requires popup blocker disabled</p> <div id=log></div> <script> -var t = async_test(null, {timeout:15000}); +var t = async_test(null); t.step(function() { var w = window.open("005-1.html"); add_result_callback(function() { 